Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 22:15:43 +0000 (00:15 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 22:15:43 +0000 (00:15 +0200)

Trivial merge